Merge remote-tracking branch 'origin/master' into feature/android

diff --cc configure.ac
Simple merge

diff --cc lib-src/Makefile.in
Simple merge

diff --cc lib/fpending.c
Simple merge

diff --cc src/Makefile.in
Simple merge

diff --cc src/fileio.c
Simple merge

diff --cc src/fns.c
Simple merge

diff --cc src/xdisp.c
Simple merge